From 42561e807b68d79fd7ecb522ed3ce8d7664ed722 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@ringlet.net>
Date: Fri, 27 Aug 2021 13:50:07 +0100
Subject: [PATCH] Fix some nits reported by cppcheck.

Forwarded: https://github.com/zchunk/zchunk/pull/46
Last-Update: 2021-08-22


Gbp-Pq: Name cppcheck.patch
---
 src/lib/comp/zstd/zstd.c | 2 ++
 src/lib/io.c             | 4 +++-
 test/read_single_chunk.c | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lib/comp/zstd/zstd.c b/src/lib/comp/zstd/zstd.c
index 628edc7..921426f 100644
--- a/src/lib/comp/zstd/zstd.c
+++ b/src/lib/comp/zstd/zstd.c
@@ -37,7 +37,9 @@ static bool init(zckCtx *zck, zckComp *comp) {
     VALIDATE_BOOL(zck);
     ALLOCD_BOOL(zck, comp);
 
+#ifndef OLD_ZSTD
     size_t retval = 0;
+#endif
 
     comp->cctx = ZSTD_createCCtx();
 #ifndef OLD_ZSTD
diff --git a/src/lib/io.c b/src/lib/io.c
index 5925d51..b91b7ca 100644
--- a/src/lib/io.c
+++ b/src/lib/io.c
@@ -115,11 +115,13 @@ int chunks_from_temp(zckCtx *zck) {
     char *data = zmalloc(BUF_SIZE);
 
     while((read_count = read(zck->temp_fd, data, BUF_SIZE)) > 0) {
-        if(read_count == -1 || !write_data(zck, zck->fd, data, read_count)) {
+        if(!write_data(zck, zck->fd, data, read_count)) {
             free(data);
             return false;
         }
     }
     free(data);
+    if(read_count == -1)
+        return false;
     return true;
 }
diff --git a/test/read_single_chunk.c b/test/read_single_chunk.c
index 3e83971..432cb5d 100644
--- a/test/read_single_chunk.c
+++ b/test/read_single_chunk.c
@@ -69,7 +69,7 @@ int main (int argc, char *argv[]) {
         exit(1);
     }
     zckChunk *chunk1 = zck_get_chunk(zck, 1);
-    if(chunk == NULL) {
+    if(chunk1 == NULL) {
         printf("%s", zck_get_error(zck));
         zck_free(&zck);
         exit(1);
-- 
2.30.2